125. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:50 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

125.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/import	demo15_old.xml	2019-12-13 09:07:02 +0000
2			2021-05-13 09:08:50 +0000

125.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	780

125.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

125.4 Active regular expressions

No regular expressions were active.

125.5 Comparison detail

1		<root>
2		<config>
3
4		<web>
5
6		<default>
7
8		<cms_home_page>
9		porto_home_15_old
10		</cms_home_page>
11
12		<cms_no_route>
13		no-route-2
14		</cms_no_route>
15
16		</default>
17
18		</web>
19
20		<cms>
21
22		<wysiwyg>
23
24		<enabled>
25		hidden
26		</enabled>
27
28		</wysiwyg>
29
30		</cms>
31		»
32		<design>
33		» »
34		<header>
35		» » »
36		<logo_width>
37		</logo_width>
38		» » »
39		<logo_height>
40		</logo_height>
41		» » »
42		<logo_src>
43		default/logo.png
44		</logo_src>
45		» »
46		</header>
47		»
48		</design>
49		»
50		<dev>
51		» »
52		<js>
53		» » »
54		<merge_files>
55		1
56		</merge_files>
57		» »
58		</js>
59		»
60		</dev>
61
62		<porto_settings>
63
64		<general>
65
66		<boxed>
67		wide
68		</boxed>
69
70		<layout>
71		1140
72		</layout>
73
74		<disable_border_radius>
75		0
76		</disable_border_radius>
77
78		<show_site_notice>
79		0
80		</show_site_notice>
81
82		</general>
83
84		<header>
85
86		<header_type>
87		3
88		</header_type>
89
90		<static_block>
91		porto_custom_block_for_header
92		</static_block>
93
94		<sticky_header_logo>
95		</sticky_header_logo>
96
97		</header>
98
99		<footer>
100
101		<footer_top>
102		0
103		</footer_top>
104
105		<footer_top_block>
106		custom
107		</footer_top_block>
108
109		<footer_top_custom>
110		porto_footer_top_custom_block
111		</footer_top_custom>
112
113		<footer_middle>
114		1
115		</footer_middle>
116
117		<footer_ribbon>
118		1
119		</footer_ribbon>
120
121		<footer_ribbon_text>
122		Ribbon Text
123		</footer_ribbon_text>
124
125		<footer_middle_column_1>
126		custom
127		</footer_middle_column_1>
128
129		<footer_middle_column_1_custom>
130		porto_footer_links
131		</footer_middle_column_1_custom>
132
133		<footer_middle_column_1_size>
134		3
135		</footer_middle_column_1_size>
136
137		<footer_middle_column_2>
138		custom
139		</footer_middle_column_2>
140
141		<footer_middle_column_2_custom>
142		porto_footer_contact_information
143		</footer_middle_column_2_custom>
144
145		<footer_middle_column_2_size>
146		3
147		</footer_middle_column_2_size>
148
149		<footer_middle_column_3>
150		custom
151		</footer_middle_column_3>
152
153		<footer_middle_column_3_custom>
154		porto_footer_features
155		</footer_middle_column_3_custom>
156
157		<footer_middle_column_3_size>
158		3
159		</footer_middle_column_3_size>
160
161		<footer_middle_column_4>
162		newsletter
163		</footer_middle_column_4>
164
165		<footer_middle_column_4_custom>
166		porto_footer_links
167		</footer_middle_column_4_custom>
168
169		<footer_middle_column_4_size>
170		3
171		</footer_middle_column_4_size>
172
173		<footer_middle_2>
174		0
175		</footer_middle_2>
176
177		<footer_middle_2_column_1>
178		custom
179		</footer_middle_2_column_1>
180
181		<footer_middle_2_column_1_custom>
182		porto_footer_links
183		</footer_middle_2_column_1_custom>
184
185		<footer_middle_2_column_1_size>
186		3
187		</footer_middle_2_column_1_size>
188
189		<footer_middle_2_column_2>
190		custom
191		</footer_middle_2_column_2>
192
193		<footer_middle_2_column_2_custom>
194		porto_footer_links
195		</footer_middle_2_column_2_custom>
196
197		<footer_middle_2_column_2_size>
198		3
199		</footer_middle_2_column_2_size>
200
201		<footer_middle_2_column_3>
202		custom
203		</footer_middle_2_column_3>
204
205		<footer_middle_2_column_3_custom>
206		porto_footer_links
207		</footer_middle_2_column_3_custom>
208
209		<footer_middle_2_column_3_size>
210		3
211		</footer_middle_2_column_3_size>
212
213		<footer_middle_2_column_4>
214		custom
215		</footer_middle_2_column_4>
216
217		<footer_middle_2_column_4_custom>
218		porto_footer_links
219		</footer_middle_2_column_4_custom>
220
221		<footer_middle_2_column_4_size>
222		3
223		</footer_middle_2_column_4_size>
224
225		<footer_bottom>
226		1
227		</footer_bottom>
228
229		<footer_store_switcher>
230		0
231		</footer_store_switcher>
232
233		<footer_logo_src>
234		default/logo_footer_blue.png
235		</footer_logo_src>
236
237		<footer_bottom_copyrights>
238		<![CDATA[©Copyright 2020 by PORTO. All Rights Reserved.]]>
239		</footer_bottom_copyrights>
240
241		<footer_bottom_custom_1>
242		porto_footer_bottom_custom_block
243		</footer_bottom_custom_1>
244
245		<footer_bottom_custom_2>
246		</footer_bottom_custom_2>
247
248		</footer>
249
250		<category>
251
252		<alternative_image>
253		1
254		</alternative_image>
255
256		<aspect_ratio>
257		0
258		</aspect_ratio>
259
260		<ratio_width>
261		300
262		</ratio_width>
263
264		<ratio_height>
265		400
266		</ratio_height>
267
268		<rating_star>
269		1
270		</rating_star>
271
272		<product_price>
273		1
274		</product_price>
275
276		<actions>
277		1
278		</actions>
279
280		<addtocompare>
281		1
282		</addtocompare>
283
284		<addtowishlist>
285		1
286		</addtowishlist>
287
288		<page_layout>
289		2columns-left
290		</page_layout>
291
292		<category_description>
293		main_column
294		</category_description>
295
296		<side_custom_block>
297		porto_category_side_custom_block
298		</side_custom_block>
299
300		</category>
301
302		<category_grid>
303
304		<product_type>
305		1
306		</product_type>
307
308		<columns>
309		4
310		</columns>
311
312		</category_grid>
313
314		<product>
315
316		<product_image_size>
317		6
318		</product_image_size>
319
320		<side_custom_block>
321		porto_product_side_custom_block
322		</side_custom_block>
323
324		<main_custom_block>
325		</main_custom_block>
326
327		<main_custom_block2>
328		</main_custom_block2>
329
330		<move_addtolinks>
331		0
332		</move_addtolinks>
333
334		<move_upsell_full>
335		0
336		</move_upsell_full>
337
338		<page_layout>
339		2columns-right
340		</page_layout>
341
342		<tab_full_background>
343		0
344		</tab_full_background>
345
346		<custom_block_next_tab>
347		</custom_block_next_tab>
348
349		<upsell_columns>
350		4
351		</upsell_columns>
352
353		<move_upsell>
354		0
355		</move_upsell>
356
357		</product>
358		» »
359		<newsletter>
360		» » »
361		<logo_src>
362		default/logo.png
363		</logo_src>
364		» »
365		</newsletter>
366
367		<contacts>
368
369		<enable>
370		1
371		</enable>
372
373		<full_width>
374		0
375		</full_width>
376
377		<address>
378		Porto2 Store
379		</address>
380
381		<latitude>
382		-34.398
383		</latitude>
384
385		<longitude>
386		150.884
387		</longitude>
388
389		<zoom>
390		18
391		</zoom>
392
393		<infoblock>
394		<![CDATA[<div class="row">
395		<div class="col-md-12">
396		<i class="porto-icon-phone"></i>
397		<p>0201 203 2032</p>
398		<p>0201 203 2032</p>
399		</div>
400		</div>
401		<div class="row">
402		<div class="col-md-12">
403		<i class="porto-icon-mobile"></i>
404		<p>201-123-3922</p>
405		<p>302-123-3928</p>
406		</div>
407		</div>
408		<div class="row">
409		<div class="col-md-12">
410		<i class="porto-icon-mail-alt"></i>
411		<p>porto@gmail.com</p>
412		<p>porto@portotemplate.com</p>
413		</div>
414		</div>
415		<div class="row">
416		<div class="col-md-12">
417		<i class="porto-icon-skype"></i>
418		<p>porto_skype</p>
419		<p>proto_template</p>
420		</div>
421		</div>]]>
422		</infoblock>
423
424		<customblock>
425		</customblock>
426
427		</contacts>
428
429		<custom_settings>
430
431		<custom_style>
432		<![CDATA[@media (min-width: 768px) {
433		.page-header.type3 .header.panel .top-panel > .links > li > a, .page-header.type3 .header.panel .top-panel > .links > li > span {
434		border-right-color: #ccc;
435		}
436		}
437		@media (min-width: 768px) {
438		header.page-header.sticky-header.type3 .nav-sections {
439		background-color: #fff;
440		}
441		header.page-header.sticky-header.type3 .minicart-wrapper .action.showcart:before {
442		color: #08c;
443		}
444		.page-header.type3.sticky-header .minicart-wrapper .action.showcart .counter.qty {
445		color: #fff;
446		}
447		}
448		.block-category-list {
449		margin-bottom: 15px;
450		}
451		.products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {
452		border-radius: 0 0 5px 5px;
453		font-family: "Open Sans";
454		letter-spacing: 0;
455		}
456		.price-box .price {
457		font-family: "Open Sans";
458		font-weight: 600;
459		}]]>
460		</custom_style>
461
462		<custom_style_2>
463		<![CDATA[]]>
464		</custom_style_2>
465
466		</custom_settings>
467
468		</porto_settings>
469
470		<porto_design>
471
472		<general>
473
474		<theme_color>
475		</theme_color>
476
477		</general>
478
479		<font>
480
481		<custom>
482		0
483		</custom>
484
485		<font_size>
486		</font_size>
487
488		<font_family>
489		</font_family>
490
491		<custom_font_family>
492		</custom_font_family>
493
494		<google_font_family>
495		</google_font_family>
496
497		<char_latin_ext>
498		</char_latin_ext>
499
500		<char_subset>
501		</char_subset>
502
503		</font>
504
505		<colors>
506
507		<custom>
508		0
509		</custom>
510
511		<text_color>
512		</text_color>
513
514		<link_color>
515		</link_color>
516
517		<link_hover_color>
518		</link_hover_color>
519
520		<button_bg_color>
521		</button_bg_color>
522
523		<button_text_color>
524		</button_text_color>
525
526		<button_hover_bg_color>
527		</button_hover_bg_color>
528
529		<button_hover_text_color>
530		</button_hover_text_color>
531
532		<addtowishlist_color>
533		</addtowishlist_color>
534
535		<addtowishlist_hover_color>
536		</addtowishlist_hover_color>
537
538		<addtocompare_color>
539		</addtocompare_color>
540
541		<addtocompare_hover_color>
542		</addtocompare_hover_color>
543
544		<breadcrumbs_bg_color>
545		</breadcrumbs_bg_color>
546
547		<breadcrumbs_color>
548		</breadcrumbs_color>
549
550		<breadcrumbs_links_color>
551		</breadcrumbs_links_color>
552
553		<breadcrumbs_links_hover_color>
554		</breadcrumbs_links_hover_color>
555
556		<sale_bg_color>
557		</sale_bg_color>
558
559		<sale_font_color>
560		</sale_font_color>
561
562		<new_bg_color>
563		</new_bg_color>
564
565		<new_font_color>
566		</new_font_color>
567
568		</colors>
569
570		<header>
571
572		<custom>
573		1
574		</custom>
575
576		<header_bgcolor>
577		FFFFFF
578		</header_bgcolor>
579
580		<header_bg_image>
581		</header_bg_image>
582
583		<header_bordercolor>
584		</header_bordercolor>
585
586		<header_textcolor>
587		777777
588		</header_textcolor>
589
590		<header_linkcolor>
591		777777
592		</header_linkcolor>
593
594		<header_top_links_bgcolor>
595		</header_top_links_bgcolor>
596
597		<header_top_links_color>
598		777777
599		</header_top_links_color>
600
601		<header_menu_bgcolor>
602		</header_menu_bgcolor>
603
604		<header_menu_color>
605		0088CC
606		</header_menu_color>
607
608		<header_menu_hover_bgcolor>
609		</header_menu_hover_bgcolor>
610
611		<header_menu_hover_color>
612		</header_menu_hover_color>
613
614		<header_menu_classicmenu_bgcolor>
615		</header_menu_classicmenu_bgcolor>
616
617		<header_menu_classicmenu_bordercolor>
618		</header_menu_classicmenu_bordercolor>
619
620		<header_menu_classicmenu_color>
621		</header_menu_classicmenu_color>
622
623		<header_menu_classicmenu_hover_bgcolor>
624		</header_menu_classicmenu_hover_bgcolor>
625
626		<header_menu_classicmenu_hover_color>
627		</header_menu_classicmenu_hover_color>
628
629		<header_search_bgcolor>
630		</header_search_bgcolor>
631
632		<header_search_text_color>
633		</header_search_text_color>
634
635		<header_search_bordercolor>
636		</header_search_bordercolor>
637
638		<header_minicart_bgcolor>
639		EEEEEE
640		</header_minicart_bgcolor>
641
642		<header_minicart_color>
643		777777
644		</header_minicart_color>
645
646		<header_minicart_icon_color>
647		777777
648		</header_minicart_icon_color>
649
650		</header>
651
652		<footer>
653
654		<custom>
655		1
656		</custom>
657
658		<footer_top_bgcolor>
659		</footer_top_bgcolor>
660
661		<footer_top_color>
662		</footer_top_color>
663
664		<footer_top_link_color>
665		</footer_top_link_color>
666
667		<footer_top_link_hover_color>
668		</footer_top_link_hover_color>
669
670		<footer_middle_bgcolor>
671		</footer_middle_bgcolor>
672
673		<footer_middle_color>
674		</footer_middle_color>
675
676		<footer_middle_link_color>
677		</footer_middle_link_color>
678
679		<footer_middle_link_hover_color>
680		</footer_middle_link_hover_color>
681
682		<footer_middle_title_color>
683		</footer_middle_title_color>
684
685		<footer_middle_links_icon_color>
686		</footer_middle_links_icon_color>
687
688		<footer_middle_ribbon_bgcolor>
689		</footer_middle_ribbon_bgcolor>
690
691		<footer_middle_ribbon_shadow_color>
692		</footer_middle_ribbon_shadow_color>
693
694		<footer_middle_ribbon_color>
695		</footer_middle_ribbon_color>
696
697		<footer_middle_2_bgcolor>
698		</footer_middle_2_bgcolor>
699
700		<footer_middle_2_color>
701		</footer_middle_2_color>
702
703		<footer_middle_2_link_color>
704		</footer_middle_2_link_color>
705
706		<footer_middle_2_link_hover_color>
707		</footer_middle_2_link_hover_color>
708
709		<footer_middle_2_title_color>
710		</footer_middle_2_title_color>
711
712		<footer_middle_2_links_icon_color>
713		</footer_middle_2_links_icon_color>
714
715		<footer_bottom_bgcolor>
716		FFFFFF
717		</footer_bottom_bgcolor>
718
719		<footer_bottom_color>
720		</footer_bottom_color>
721
722		<footer_bottom_link_color>
723		</footer_bottom_link_color>
724
725		<footer_bottom_link_hover_color>
726		</footer_bottom_link_hover_color>
727
728		</footer>
729
730		<page>
731
732		<custom>
733		0
734		</custom>
735
736		<page_bgcolor>
737		</page_bgcolor>
738
739		<page_bg_image>
740		</page_bg_image>
741
742		<page_custom_style>
743		<![CDATA[]]>
744		</page_custom_style>
745
746		</page>
747
748		<main>
749
750		<custom>
751		0
752		</custom>
753
754		<main_bgcolor>
755		</main_bgcolor>
756
757		<main_bg_image>
758		</main_bg_image>
759
760		<main_custom_style>
761		<![CDATA[]]>
762		</main_custom_style>
763
764		</main>
765
766		</porto_design>
767
768		<mpsearch>
769
770		<general>
771
772		<enabled>
773		0
774		</enabled>
775
776		</general>
777
778		</mpsearch>
779		</config>
780		</root>